- added some new code - faster locationgetting
- deleted unused classes