Minor bugfixes and shorter demo