changes related to new version of Moonridge, also tweaked facebook factory