Merge pull request #152 from jrrideout/death-march

Add a couple more input handlers.