simple updates, mostly final