Improve documentation
Improve error handling interface, messages