more love for the kitten

:cat2: 

not all of the new functionality has been triggered by jobs today,
but I'm pretty sure it's all net improvements

I mean, what could possibly go wronger?

review by @jsuereth