Big update

Removed and added lots of stuff with this one