add more meat on tweet
Merge branch 'hotfix/tweet-tweak'