Integrate and fix oauth stuff