Changes

* bug fixes