Cleaned up demos a little more.