Added remaining tokens ... I think I got them all.