Bugfixes, should work now