misc initial tweaks