Huge Update

Massive update containing many changes and new features.