touch up token grammar and note gotchas