mst-parser bug-fixes.

Now she works! Yayy!  That was harder to do than I expected.
Too many false starts.