Time for fixins & salad greens

Various fixes and tweaks as described in fascinating detail in the commits :tongue: