Put back some inits and tweaked design per Marc