Tweaks to support toolhead and better positioning.