minor refactoring to intialiser setup. Only show solution is it's not a monster error.
minor changes, restructuring
code auto-clean up
Merge pull request #615 from debrief/598_duff_solutions

598 duff solutions