fix bug and change map