minor things, mostly comments