more clean up, and an oops, oh well