More small changes, mostly simple updates