silly lil' bugs: fix entity deletion and probably other things