catching up with bugfixes