Mostly content updates, some demo fixes