Add solution output, fix minor step1 bug