add comments
fix subject and content validation