fix authentication and shell wrapper