Updated some comments and fixed a couple warnings.