Fixed some bugs/typos