Changed sequence and placement of demo app's start invokation : misc small cleanups.