fixed kinks in comment vs new feature and my moment-math