fixed issues related to exercise 10