grammar: bug fixes and add duration regex