Fixed and Added lots of stuff