Major updates and fixes