tidied up demo controller and completed demo delegate implementation.