Modified warning message, also comments