Tabstop equal 2 and minor updates