added item combiner, and updated other files accordingly