minor bugfixes #12