Cleaning up facebook integration and other bits and pieces