remove some of my more obvious cockups