Bugfixes - demo fully working