Cleaned up the demos a little.