Msh next

Some enhancements and cleanups.