Add CML validation, move CML generation after MOL generation.
Fix copy/pasta comment.