Further translation, doing some fixups along the way