Just changed comments and warnings