incremental
and delete things
some tweaks