Redid some item stuff