Experimental: recreate inventory and fixed some bugs