Added the comment form
Fixed the task messages