more work on card migrations
more progress on migrations
changing code to match renaming
code changes to match latest migrations
tweaked setting order on set cards