"tool" folder small fixes.