fix command tools and commands