Comments and changes from Jon