Tidying up some comments.
Fix build warnings.