Some little changes to Madnuel code