clean up geo stuff a little