fix inventory estimation
Merge regboard/master