more touchup on migration script
auto-pulled latest wagn code