always use + register for copy-paste
fix comments after maps

No comments should be used after a map command, because it treats
them as key sequences or commands.