Did some rearranging of lesson 2, made some fixes