Killcode additions; many fixes