Summary: More cleanup. Added a few TODOs. Disabled mbs-funcs until its fixed.
Testing: loadmbs worked fine, mbs-func and mbs-git worked fine.
Reviewers:
Issues: