added timer
tightened message regexes