demo fixes
version rc1