Lots of updates

Formatting + more