fixed more grant type stuff