had another merge to deal with in step and a few typos in the tracpy class