some work on exercises
small changes