Various extensions to the calculus patch