More fixes and changes. Still testing MST