Demo cleanup & bugfixes