Finished Problem #66. And some small changes.