fixed most FB problems