added support for comments
email validation

and other minor changes