Merged in changes. Update to inventory and such