don't override CR, sorry gary
upcase <CR>
remove comments, hide conflicting window commands (for now)
updates from upstream