Added problem 20
Made 16 a little nicer