testing and bugfixes