Fix typos and clean up a bit
Add error handling to readme TODO