bit more coverage and cleanup, still need to switch to Logger