Small changes

Still no edits on evaluation