ok, going to make a new pr with those changes now should be up in a few