More fixes and tweaks.
Fixed tabbing away.. again. FFS!