Bug fixing, and MG update.
Final update (very minor changes).