More tweaks to socialisation tips
Resolved merge conflicts