Greetings,

 

All is back to a semblance of order. Patch 1 and 3 still need sign off.