Add recalc_map_points
Add recalc_player_points
remove unused variable
Add player merging