Huge content and bugfix update