some refactoring.  Gravatar and Facebook support.