oauth/webhook fixes, whitelabel fixes, code cleanups