Reorganized tools and warnings.