various consistency changes
implement expect array of tokens
consistency