changed expr match regex
added block helper logic to allow comments; extract comments