Added in twitter, fixed small issues