bugfixes during final testing