Cleaned up and improved a few demos.