more flexible worktree tools
even more worktree tools