Various updates, transition to itemstack system, checkin commit