finished S2

completed S2, comments still missing