Removed some unnecessary stuff and tweaked all the things ;)