some bugfixing & CommentWrapper improved