Slight updates, make a few statements clearer