improve parser
fix multiline comments