Improved a lot of things :)