Documentation about constraints and minor fixes