Add support for using MA ID's directly.
A few finishing touches.