some small bugfixes