.
some minor bugfixes