Some quick formatting fixes
Reorganized, merged conflicts