Added Item class, small fixes