- added constraints and typ rules