added more chapters, fixed exercise numbers