Adding FB integration and clean up