Updates from a final read through