Added problem 7 and updated general