new item class, other fixes