GPS Emulator fix + -then Bug fix