Some more tweaks and fixes to item management...