a bunch of changes addressing the "accesstoken" issue