yet more code edits