Minor changes to only draw loiter when in loiter mode.  Minor function
cleanup.
Merge branch 'master' into qt