Lumberjack fixes to make faster, and fix spirals