cleanup; small bugfixes