totally improved expression_spec
minor improvements to comment_spec