I'm willing to merge every change you've made in this pull request, if they have proper testing and documentation, with their fixes. So I think it's up to you what you want merged first.