Major updates and bug fixes
Major updates and bug fixes