clean up and fixes for Item Helpers