minor changes PLUS new excercises