Add a TODO and update README.

Also, renable error checking.