Lots of little fixes and reverted NBT

NBT handling changed back to the way it was before, NBT storage hack
failed super hard.