Bugs and that, and mpc tweaks