ENH: New constraints, improved short descript. rendering