* Some comments were fixed