finish map remend bugs