Sum fixed
Cleanup payment math