Tweaked all the NBT methods

Same as the PR before, but for all the other machines