cleaned up glr things