final integration

fix delete bug
can be expanded