Updated some comments and fixed warnings.