Updated some stuff
Formatting changes & fixes