dammit, i forgot some other updates that are now fixed with this commit