mapi2 fixes.
Beta get stability.
Fix indent.