minor fixes
minor bugfixes