Added most tokens ... keywords remaining.