assorted changes also caml paper