fixed some battle bugs.