Cory

Made things look a bit better
cleanup for master
started to work on ouath