- minor comment changes, and some renaming of variables