OptionsFile to makefile
tweak inheirted/move usage for Contaiers - so more regtests pass - but still broken