Add pascal mappings and comments
Add highlight trailing spaces