minor constraint changes. Note still todo value validation.