Proofreading & fixes