Minor comments throughout