More Items Stuff with NBT
* huge cleanup of code