Finishing some of the calc problems