changing some things with the rendering, and a bit with the code prettyness