Starting work on the arena…

The merge tool is finally done, and while it was a truckload of work, it was worth it for the amount of small bugs I found… Nothing was too serious or hard to fix, but most where quite complicated to find and would be hard to fix later! I’m finally finished with all the detours [...]