fixes
location algorithmus
misc
Merge remote-tracking branch 'origin/location' into dev