Fix bug where URLs (and indices) were taken from main tweet, not re-tweet.
Announce follows.
Minor tweak to names.