Bugfixes, still not working