fixing various bugs/typos.