Extracted the comment form...
Tried to fix the comments...