tweaks to initial and setup