fix some minor bugs & tweak some words