Comments.
A little reorganization in core.ml & comments.

More clearly separating between masked and non-masked versions.