minor corrections; hard-coded string tokens matching