MAC class now exported
Warnings pruned