add required fields, bug token hours and generate and set token