Lots of formatting fixes!

and stuff