Lots of fixes - oauth works