Proofreading, merge in comments