oAuth Authorization grant update + minor changes