Some comments changes