Fixing some Ch 9 exercises
Merge branch 'updating-users'