fix bugs
Merge branch 'feq-capping' of github.com:amcadmus/noneq.msm into feq-capping