Improve inventory upload & miscelaneous