Various changes; Edata file replaceing implemented