Some tab normalization and a few tweaks