Implemented some important changes recommended by mcef