Corrections after feedback from Jon and Thomas.