got some improvements with battle system