better fix for comments - supports comment escaping