exercises 4.11-12, cosmetic fixes