Added more functionality to retweets and favorites
merged conflcits