several improvements to the syntax, improvements for vimtutor files