Improved demo site + bugfixes