finished midterm + updating final