Add item property constants... fix some mistakes