update to include most of the 'frees'