Turn on the map again!
Fix map related deadlock. still appears to be another deadlock; still searching... May need a better system for signifying changes.