more bugfixes, works but slow destroy