finish up calcs