mpc tweaks and tests