Some minor adjustments to problem 1 and 2