Fixed Twitter and more cleanup