Twitter pulling/ various refactors