Edit fixes from Miguel and Professor Sadoulet comments