Uber changes

Made the README robust and elegant.