More sensible map defaults.
But dear me, it badly needs refactoring and DRYing up!