small bugfix
various small improvements