fixing various bugs/typos