Change spawnEntity to addItemstack, also a few other tweaks