Added mm_types.h among other minor changes