A few bug fixes and additions to the social stuff