Added new fighting character and simplyfied some of the code