Tool control updates. Code cleanup.