typo + bugfixes