Fixes and more exercises.