Tweaking.

- Getting rid of many "todo" statements: Adding error discussion.