location fix. cleaning up