Zenfunding Rey Fork


Feel free to merge if you'd like the changes. I should have done a pull request with every commit so you can pick and choose. Sorry, we'll get better as time goes I'm sure.