added item class, other improvements