better interaction on oauth and other small fixes