Small code changes, mostly comments