Another load of changes, mostly comments