small changes, mostly in comments