Finished the stretch challenges
A few changes