small bugfixes to continue!