Tiny things, mostly comments. Some fixes?