fix social and clean up