Fixed tools and cleaned them up