Fixes to spring and calculations.