Some final review fixes
Merge pull request #10 from raoulb/error_final

Some final review fixes