Tweaks to spiral stuff