more bugfixes, more items