Grid cloning bugfix, demo fixes