general bug fixes (oauth and mustache)