Update to hotfix1; fix many breaking bugs