demo page wip, bugfixes