Started on the inventory and fixed some bugs.