Added comments, got rid of warnings.