fix bug and change words