bugfix: with-signal-handler
function re-naming / documentation / stylistic change