Big update

Lots of stuff