robustness and editorial changes

Please review these changes to the upstream code. They're mainly geared to get rid of the Debian patches and to adapt to my changed programming style of the last two decades