Fixes and more social