Mostly nitpicky minor changes

some comments added