comments and minor changes and lots of digging.