tidied up stuff. facebook and twitter stuff is disabled for now