Switch supposed comments to actually use the comment prefix
Use canonical separator for mapflags
Fix some casing and spacing issues