Switch to normal exit() in termination handler
Revert "Add missing factors of (2pi)^2 in off-diagonal terms"

This reverts commit d3127df5c8b68626fd393b15a952f3b2b9b21592.