Fix caps in comments, add normal mode shorcut