Added integrated inventory, minor fix