Added social activities and made some bug fixes