Bug fixes, and map enhancements.