A few bugfixes. PvP works, but issue #13 blocks PvE