Updated Added and Fixed a few things