Fix some things I seem to have inadvertantly broken
Working damage recalibration
remove debug code