more stuff, cleanup