Simplify the sample app. Update some inline doco.