Denis1

merged OAuth stuff and few fixes