Cleaned the code a bit and changed FB configration