More tuning. Seems to be working ok for M0. LOTS of work needed before we can start working on M1.