Minor, unimportant, fixes and some layout things.
Indentation fixes to hard tabs and a few spaces.