more tweaks to prepare for deployment