Fixes for M6
New files for M7 
Will finish tomorrow