Merge mustard

I have had a lot of GIT probelms todip after my computer locked up and needed several thing rebuild afterwards - as a result Git has got itself confused.  Pick the relevant merge out of this it fixes a couple of bugs and introduces stretchable storage for blast furnace runs (only).  They are toggleable.