fix up facebook implementation a bit