Fixed 10, 22; Added 47-64.