Updates from first 6 chapter rewrites