more changes, now rather complete, but needs proofreading