misc changes
Merge branch 'master' into brian
minimap start position fix