Now units in output file. Improvement of evaluation skript