More column width fixes
Add vim modeline for formatting