Fixed some typos, added in automatic canvas checking