Minor fixes, mostly comments