Add validation to comments. Fixes #10