Better monitor/demonitor handling for map critters