reactivate tokens after creating a new one, fix fields, add fields in correct models