Updates

Notably I reorganized PVP, in preparation for new game modes (goals)