Updates done my Marcus Noble while testing these setup notes