simplify a lot
add tests
forward errors
1.1.0