whitespace fixups
properly trap each signal individually as ERR does not catch them all