Code comments and minor fixes.