Added automatic line comments when using expanded output and watch