fixing up the social stuff - not done w them yet tho