version 2

I think there are probably a lot of places where the lines and comments are more than 120 char.  I'll fix everywhere now.