Minor updates and fixes
Major updates