Bugfixes, but some bugs still remain