Fixed missing comments for new options
Removed duplicated code when killing a process after graceful killing fails