more goodies, cleanups