More buggs removed