Summary: Cleaned up some more code, added a few exceptions for known issues.
Testing: loadmbs worked okay