Minor tweaks to improve some ransitions