small tweaks in preparation