bugfixes again