Some comment and kernel class fixes
Merge pull request #1 from grtkachenko/grtkachenko_antonkov_fix

Some comment and kernel class fixes