a few tweaks to init