Fixed questionable formatting choices.
This is why git rebase is a horrible horrible thing.
Added missing file in previous commit
Fixed issues caused by previous commits