Map feature comment fixes

Fixes #1605

along with some other fixes