Cosmetic changes to demos and more commenting