cleanup

and new utilities for damage functions