More demo programs
Minor updates