fixed map trails, various other fixes
Merge pull request #184 from wriley/mapfix

fixed map trails, various other fixes