Fixed some issues with commenter