Some improvements in EDA code.