more bugfixes, still not working