Demo doc updates and other cosmetic changes