Fix more typos. Fix broken demo