several more changes, very close to being ready to submit