Renumbered exercises. Fixes #2