Added last minute changes made before the demo, hadn't checked them in yet...