ongoing bugfixing