small tweaks and bugfixes in preparation for demo