FB likes: added 'name'.
minor refactor.  comprehension madness.