fix constraints and make
find instances dialog - better code, write some code automatically
replace instances dialog - better code, write some code automatically
fix diff test