exercise - pr fixes