More comments and revisions... blah