Additional refactoring and fixing of failing tests.
fix for damage calculations.  All tests now pass again in "dev" setup.