Updates

Fixed calculation errors, improved checklist.