Beautify, and add some more stuff