many small changes, mostly comments