More changes based on mike's feedback.
Merge pull request #4 from meanderis/eds_edits

More changes based on mike's feedback.