fixed errors and added new type tokens