Add a force-claim setting, add comments