tabination fixes and other fixes