Adding polling on FB
Fixing fabs errors