Inventory - additional files and fixes

Some files were missing in the last commit.
There also were some minor bugs which have been fixed now.