some change/fix. finish to make simple CRUD