further tweaks to init