Minor tweaks, mostly adding comments and commenting out lines.