Improve/refine killmodes handling
Fix tiny comments-typo