clean-up, fixed couple of typos