Aside from this I think the PR is good to go, though I still need to try it out manually :)