Got inventories to update properly
Merge branch 'nick'