Adding comments and a few changes.