got the MadComponents list a little more in shape