bugfixes
minor fixes