little clean ups; added demo app;