Cover code with comments and produce minor corrections