Edits to diameter calculation in viscalc, carried through