More comment refining. Ready for evaluation.