some cleanup,  two more tools.