Added several EDT changes

See commit message