bugfixes in progress