More Cleaning. Added demos.