Fixed and added some crap