Update all the things
Fix stuff around initialization