De-escalated indenting hell/fixed signalhandling