add some checks & oauth adjustments