Start working on v0.058, plus some things I forgot with 0.057