Cleaned up a bit of the map code
Map range circle is turned off when error range == -1
Merge branch 'pdev' into jdev