comment and bugfixes