Major updates and bugfixes
Major updates and bugfixes