more item refactoring tweaks