See Unit 4 for the present perfect and Unit 5 for the past simple.