updated some battle stuff