Some comments were fixed