fiddling and cleanup