improvements
setting up parsing of comments