more work in progress on distclean and stage5