Updates from @gwitmond for the @nulpunt project.