Fixed bugs in location code, location now fully functional in emulator.
Merge branch 'bradley'