tool improvements