some minor fixes and new demo app.