added damage calculator, minor bugs remain