Edata Dictionary fixes, minor changes