cleanup, additional minor tests, ...