Improved specs, reworked battle class