numerous changes to sync up content with live version