Fixed demo pages and some typos