Finished Inventory and refined some code