commit mpc and grammar stuff