Fixes for twitter site changes and refactoring