Add Chris's changes and some changes to the subtract method.