added @rockivist's ead to control; some fixes