polishing and fixing bugs in battle system for milestone 2 presentation