Fixed up the shapes demo, fixed a destroy issue in 'program'