Tidying up exercises, and adding more steps