Many small cosmetic changes for demo