updated ouath some more
fixed up some error handling