list killer, some fixes