MAF is not a closely followed spec to format
Reflect this is *my* fork
More doc, fixed incorrect whitespace
Further housekeeping