Comments, renames, and other small stuff