*[mom2d] small enchancements