Comment fixes and small stuff.