comments and bugfixes