Question 4.1c and some fixes