Updated and cleaning some things :)