Submission version, tweaked.

Added comments at top-level