rename collections and cleanup
change location entry fields
combine related entries