More tweaks to better control the different steps