Updates

Alot of updates