Map fixes, crawl tweaks