some tweaks to init setup