Evan

Results 1 issues of Evan

I'm sorry there's 2 changes in this pull request. I should have done these on separate branches rather than on master. Feel free to reject the pull request and just...