Fixed boxsets, started work on play states