* some more tests
* a little better error handling