adding more twitter, more refacting