added who did what and commented the code