mpdecision: some tweaks and some 4 core messaging removed because we only have two