Added some small changes and some crap