incremental update

- updated tests
- fixed some some
- added some checks