more tweaks to setup data