some small bugfixes.