more inventory related fixes/additions