all sorts of cleanup, and testing