The NBT Overhaul

and some minor tweaks.