Cleanup old commented code.
Add ErrorData to test/example.
Update comments