hlim10 kchen26 : Modify errors + add Battle Activity