Some minor touch ups to nbt, and some more work done on fw