Fixes
More fixes
A whole slew of fixes in this one. That should be everything that was brought up minus cameras. I'll do those nowish.

ALSO, updates this shit to be compatible with Linda.
Merge pull request #57 from Glloyd/Mapping

Mapping Fixes