Some comment and kernel class fixes