constraint + comments + bugfix