main + tool comp fix