various and sundry data migration changes