more edw changes/bugs