Comment tidy, testing fixed?

Now with far fewer lines! This section now contains 50% real code,
rather than 25%.

-deprecated constructor for Demo now mirrors real constructor (for
testing?)