Code cleanups and fixes
Merge branch 'master' of https://github.com/Corrodize/Locator