bugfixes in comment-out