Objective-C 2: comments, minor adjustments