Lots of small changes, mostly towards getting basic game mechanics working