updated paths for new tool name; cleanup.