Big Update

Alot of stuff