Fixing up the comments and a couple of syntax warnings.