some cleanup and more in the demo section