fix bugs. Add comment regexp.