Finished prettifying and more. I really need to get better at committing.