Token insert improvements

The new feature in v2.1 where tokens can be added to emails by selecting from the option box is great. Couple proposed improvements:

1) When you click an option, it inserts the token at the end of the existing content. It would be great if it inserted the token wherever the cursor was placed. I'm guessing you'd have to use some other tool for the option box as the focus moves from the insertion point when you click on the token form element.

2) Currently, custom fields are listed according to their number (contact.custom_1). That's a little tricky for the average use, as the id for custom fields are nowhere listed in the custom data tables. It would be great if the token listing showed custom fields based on their field label rather than actual field name.