Updates and cleanup to added Twitter and Facebook functions.