A few small changes which wrap up the remaining differences between Eloe and I's outputs.