SOCIAL - many, many more fixes