Small last minute changes

that were not used for the actual demo