Update for standard edition and fix some bugs