auto breaking comments fixes

Fixes some bugs with auto breaking comments that I found during the last weeks.