fixes and datasource api changes (s/delete/destroy)