reorganization of several MSP methods, small optimizations