Fix calcs, update formatting