Changed damage values and cleanup