cleaned up some stuff w/ the previous gl-related changes