Finish remap list and fix player position