Mostly second checks in this one, possibly new maps.

Mostly second checks in this one, possibly new maps. #397