Alright. Cool! If you don't see other issues for now, I think I can finally squash all of this into master :)