few alterations for the demo.
cleanup