Better 'make clean'ing
Committing these fixes to looping now, before I embark on some more invasive and risky fixes...