fix evaluation part, and working on cleaning raw data