Fixed a lot of the formatting errors of before

Should now work.