New Inventory

New inventory implemented, also a few new items and changes