Lot of bug fix, mostly around the the fight