a little cleanup and added FS inbound
Merge branch 'master' of https://github.com/kkroo/facebook-1