Fixed various little bugs/typos