fixed a bunch of location stuff, still problems with magnitude of ES