Work on battle system, other improvements.