Played about some more with comments and names.