Fix the name re
Move metadata out.
Fix a reference to num_cores.
Add name re, run all initial updates, reorder some stuff in questionable ways.