updated with oAuth facebook + twitter support