Made patches to DE based on user feedback. Waiting for confirmation.
Merge branch 'de_fixes'