bunch of bugfixes, new deletion