validation added; comments support added