Fix some errors and add draft of evaluation part