a lot of things fixed and added

working on the combat History at the moment, some wierd error is getting
me though