fix some bug and wording