Ah thanks! I don't know how I missed #2, but both are easy fixes and I'll knock em out.