Added comments about MAM
fixes