Upgrade to latest 3.0 code

added fb features and DB