Cleanup demo files & correct some typos