fix some error messages and doc
Merge pull request #57 from jgawor/doc

fix some error messages and doc