fixed more fb bugs