Bugfixes, getting ready for a demo