Added social crap, improved style