fixes to track location - issues 3, 4, 5

Fixes resolve issues [3](https://github.com/adminion/freebox-finder/issues/3), [4](https://github.com/adminion/freebox-finder/issues/4), and [5](https://github.com/adminion/freebox-finder/issues/5)