More work on the nbt parser