Fixed Demo Mode to the point where it works well enough to use