Improve inventory. Rearrange type info.