Better loading of items, bugfixes