Fixed unexpanded tabbing
...and more bad tabbing