WIP: misc changes

This commit will be squashed into others eventually
16 jobs for zbrown/search
in 50 minutes and 38 seconds, using 0.0 compute credits, and was queued for 8 minutes and 47 seconds
latest