clear code, add some fixes for CRUD, sync with README