eopt: various changes