Tweet streaming works better
Fix merge conflicts