Updates

Tidying. Decided the John project wasn’t possible at this point and
I’ll wait on an upstream release instead.