minor bugfixes;