comments clarification, demo site minor updates