More Features - multiple action states

Also set some defaults and made sure the refresh token doesn't get blanked out.