finish and correct question1, clean up