Tweaks and updates for the spigot speed problem