Minor - Fixing comments, fixing PHP warnings.