screaming_death improvements

Closes #97.

<!---
@huboard:{"order":109.0,"milestone_order":109,"custom_state":""}
-->