Refactor some player code; fix triple merging (make [head]222 become [head]24 instead of [head]42)