and even more bugfixes