* More Map fixes and tweaks.
* Fixed constructor parameter constness for all classes.