social persistence and display fixes