some calc fixes