Exercise 1 solved

- Plus minor fixes