Small changes and added exercises