bugfixes on manual testing