Fix typo
Remove unnecessary organisation code
Correct calculation at the top
Add commitment indicators, correct calculations
Correct calculations, add commitment indicators