initial version of oauth2 with shock suppport
minor fixes