bugfixes for comments