Software to edit chess variations in tree-style form

I'd love to find a PC program with which I could organize properly the different lines I find while analyzing a game. So far I've been using Arena, but I find it very limited. What I would like is:

* To have a tree representation of the game

* Each node is a move. I'd like to have the ability to fold/unfold each node, so I don't have to have all the lines shown in front of me all the time.

* It should be possible to order at will all the possible moves below a node. If I have analyzed 4 variations from a position, I wish I could enter first the most promising, then the second best, etc.

* It should be possible to insert text annotations.

* Of course it would be a plus if engines could be started at will to analyze positions, like with Arena.

These ideas seem so natural to me that I feel pretty sure other people must have missed them way before me. So, do you know any software along these lines?

Thanks!!

I have the same thoughts, but I can't seem to find any board with these features. Have you found anything yet?

Bump. Looking for the same thing.