A few touch-ups to the code.