a few bug fixes and single line tabs