soe improvements

closes: #227