added ItemStack Builder + renamed some things