Fixing various bugs/typos.