some demo bugfixes