08.21.13 some demo bugfixes