Improve user guide, fix one typo