testing and bugfixing