Minor modifications, mostly in comments