Pre-Demo, Minor bugs.