demo fixes
various fixes