Some more Elements II and other minor map fixes