Demo update + various fixes